[IA64] build fixes

Add defines to fix hvm_vioapic and trivial warning fix.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/xen/arch/ia64/vmx/vmx_init.c b/xen/arch/ia64/vmx/vmx_init.c
index d13118b8cf42358c82d87f2dde45320ed3a69498..d4be24cc951aa2c114ef3afbfd9a3c3a1f8facea 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_init.c
+++ b/xen/arch/ia64/vmx/vmx_init.c
@@ -276,7 +276,7 @@ static void vmx_create_event_channels(struct vcpu *v)
                        p = get_vio(v->domain, o->vcpu_id);
                        o->arch.arch_vmx.xen_port = p->vp_eport =
                                        alloc_unbound_xen_event_channel(o, 0);
-                       gdprintk(XENLOG_INFO, "Allocated port %d for hvm.\n",
+                       gdprintk(XENLOG_INFO, "Allocated port %ld for hvm.\n",
                                 o->arch.arch_vmx.xen_port);
                }
        }

diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
index 38ffe33b824792ad65eaed5df31218e91f7c8caa..05910e4310e9d922219dad392960770ab298a351 100644 (file)
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -280,4 +280,9 @@ struct screen_info { };
 /* Define CONFIG_PRIVIFY to support privified OS (deprecated).  */
 #undef CONFIG_PRIVIFY
 
+/* Necessary for hvm_vioapic.c */
+#define vcpu_vlapic(vcpu)   (&(vcpu)->arch.arch_vmx.vlapic)
+#define vlapic_vcpu(vpic)   (container_of((vpic), struct vcpu, \
+                                          arch.arch_vmx.vlapic))
+
 #endif /* _IA64_CONFIG_H_ */